Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 8 Jun 2024 11:34:20 +0000 (07:34 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 8 Jun 2024 11:34:20 +0000 (07:34 -0400)
53e9caa23ef ; * doc/emacs/help.texi (Help, Apropos): Improve text and...
00360258cad Fix treesit-parse-string crash (bug#71012)
20af58d3a13 Check for buffer liveness when accessing tree-sitter node...

1  2 
doc/emacs/help.texi
lisp/treesit.el
src/print.c
src/treesit.c
src/treesit.h

Simple merge
diff --cc lisp/treesit.el
Simple merge
diff --cc src/print.c
index 7aacd2b2e906c79882e5a6a347ce707b8fc5a1e5,8ee5a3616eb302d2fda928cde51848400b6f8a68..6a27ceac5f0bd9f198127bbb9561aa5c42f8ad0f
@@@ -2031,8 -2027,13 +2031,13 @@@ print_vectorlike_unreadable (Lisp_Objec
        if (!treesit_node_uptodate_p (obj))
        {
          print_c_string ("-outdated>", printcharfun);
 -        break;
 +        return;
        }
+       if (!treesit_node_buffer_live_p (obj))
+       {
+         print_c_string ("-in-killed-buffer>", printcharfun);
+         break;
+       }
        printchar (' ', printcharfun);
        /* Now the node must be up-to-date, and calling functions like
         Ftreesit_node_start will not signal.  */
diff --cc src/treesit.c
Simple merge
diff --cc src/treesit.h
Simple merge